fix(cli): preserve committed worktrees on forced shutdown - #189

Intent

Land community PR #168 to stop gnhf from deleting a --worktree checkout that still holds commits when force shutdown bypasses normal cleanup, specifically the double-Ctrl+C and shutdown-timeout half of issue #167. #168 is the selected fix over #170 and that choice must not be reopened. Keep the change narrowly limited to force-shutdown preservation: do not fix, refactor, or otherwise alter the separate Linux sleep-prevention re-exec parent-exit defect owned by sibling task gnhf-worktree-selfdelete-d2. Preserve Eric Cao's original commits and authorship, adding only follow-up commits needed for correctness or validation. A forced shutdown after commits must preserve the worktree, while a forced shutdown with zero commits and no pending commit failure must still remove it. Before timeout exit, when the worktree is preserved, print its absolute path on its own clear, copyable line. Add a committed automated regression test scoped to the existing preservation logic: assert that the commit-bearing cleanup path leaves the worktree intact and reports its absolute path. Do not build new double-SIGINT testing infrastructure. Unit tests alone are not sufficient evidence: retain the narrower automated regression and put the completed manual signal-path reproduction in the PR body with exact steps and observations. Manual proof: temporarily set FORCE_EXIT_TIMEOUT_MS to 0 and temporarily make the mock opencode agent complete iteration 1 and hang on iteration 2; in a fresh temporary git repository with a temporary HOME, sanitized git config, telemetry disabled, e2e fixtures on PATH, and prevent-sleep off, launch the built CLI with prompt hang after first commit and agent opencode in worktree mode; wait for the first commit and second message:start, then send two SIGINT signals 20 ms apart. Before #168 the result was exit 130, one timeout hit, 2 branch commits, 0 worktree directories, and 1 worktree registration. With #168 the result was exit 130, one timeout hit, 2 branch commits, 1 worktree directory, and 2 worktree registrations. The zero-commit control used prompt slow cleanup and produced exit 130, one timeout hit, 0 worktree directories, and 1 registration. The contributed regression test originally passed without the fix, so it was strengthened to hold the orchestrator open through timeout and proven to fail on unfixed behavior. Keep the diff tight and reviewable, do not add em dashes, and keep all repository CI commands green. If rebasing onto current main incorporates sibling d2 such that #168's state guard is redundant or contradictory, stop for a needs-decision keyed pr168-superseded-by-d2 rather than silently dropping or retaining it.

What Changed

• Preserve --worktree checkouts during exit cleanup when the run has commits or a pending commit failure, including forced-shutdown paths.
• Report the preserved worktree’s absolute path before a shutdown-timeout exit.
• Add regression coverage that holds the orchestrator open through timeout and verifies the commit-bearing worktree remains intact and its path is reported.

Risk Assessment

✅ Low: The change narrowly preserves commit-bearing or commit-failure worktrees across forced exit paths, retains zero-commit cleanup, reports the absolute preserved path before timeout exit, and adds behavior-oriented regression coverage without altering the separate sleep-prevention path.

Testing

The focused regression and zero-commit signal control passed. The built-CLI double-SIGINT reproduction exited 130 with one timeout, two branch commits, one preserved worktree directory, two registrations, and its absolute path printed on a clear line; all temporary testing edits were restored.

{
  "result": {
    "code": 130,
    "signal": null
  },
  "timeoutHits": 1,
  "branchCommits": 2,
  "worktreeDirectories": 1,
  "worktreeRegistrations": 2,
  "preservedPath": "/tmp/gnhf-manual-signal-MHHOrz/repo-gnhf-worktrees/hang-after-first-com-b75c20",
  "pathReported": true
}

--- stderr excerpt ---
  gnhf: shutdown timed out after 0s, forcing exit
  gnhf: worktree preserved at /tmp/gnhf-manual-signal-MHHOrz/repo-gnhf-worktrees/hang-after-first-com-b75c20

Pipeline

Updates from git push no-mistakes